6171d11e72
(cherry-picked from 186b36b65bdfbf2c89a661539bf530359364eac9.) Bug: 6857263 Change-Id: If787d84415dd2ac07105fe0d0b7a27c9be75df64