Merge changes I4a49ddbc,Ied2bb7c8 am: 63999c39fe
am: 5fcb338ad6

Change-Id: I25f3bc9521cd9e8fd9bc5422ec68e0fad233ac60