Merge changes Ie7d80bbb,I8e27f8b9
am: b62d5ed25e

Change-Id: I6d7bf1864d45301cc524c0175f6c4724cdedcaff