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

Change-Id: I7313524cb51288925345628d2d69b62a83f7c449