Merge changes Iefc46d8f,I8f65096d
am: 4aef28ae89

Change-Id: Ifb9f4de0648e51dce1218e35d89d791f883ea361