Merge changes Ic7620978,I6d5bab58,Id1668c26,Icdb56b6f,Ic0c86a2b am: 794acfc0fe

Change-Id: Iaa075bc86514e0cbef21943dc927b6287ce7652d