Merge changes Iaf842b35,I987c0d19,If20e9fb9
am: 7d34a79a4c

Change-Id: Icd9885962e279a0ecdb0c431cf8daa710edc653c