Merge changes Iaa153fca,I619e2d8a
am: 59acc059a6

Change-Id: Ic657c33aa5fd728d0e5a8fc3c6c23c0fff420844