Merge changes Icbdf4979,I1a6f135d
am: 70415ceb9e

Change-Id: I8ca18cdaff1378f4d5a9bdfa2d6c8883ae8447a0