Merge changes Iea2a3055,I6582cfc6 am: 45562bfb63
am: 54b603ee56

Change-Id: I7fd99aa08ac1911eba06255a77e693d76b3d06ee