Bug: 27441320 Change-Id: I2d1230013bd499ff00015890eedb63943f9904ec (partially cherry picked from commit 1b2f59a5)