Merge changes Icf78c709,Ic7ec11ab,Ie5c9d31e,Ia935bac4 am: 2742062a6d am: ecc920a9a4 am: 41db049775
am: 317af928fc

Change-Id: I9cf7a14502f2f0bd04fb8b48151321a24c4e7164