Merge changes Icf78c709,Ic7ec11ab,Ie5c9d31e,Ia935bac4 am: 2742062a6d
am: ecc920a9a4

Change-Id: I47dd69f960b63bcee133f23d9b61c6e028693739