Merge changes I34842acd,Icc6c4d6b am: fb3dccd961 am: b6081962ee

Change-Id: I801ab058c34ed261f6ca4d100927a0cd89fd8e02