Merge changes Id0b98e74,I5d05b171
am: a3920a0435

Change-Id: I4f321041bf87ca4f60196e84f57d7152278ff1fd