Merge changes Id0b98e74,I5d05b171 am: a3920a0435
am: 2f161a7e50

Change-Id: Ie7d609adf4c822be5ca254256abc64f2c5f5bae2