Merge changes Ib3354417,I400cf4cc am: b3d294dd8f am: 15d2054891
am: 118936b240

Change-Id: Ie6c7874355d51bd8e5898a0a398d36544beb7af6