Merge changes I6345a10d,Ieed81827 am: 907cc62b6d
am: 4f51efe30b

Change-Id: Ifaa7173ea4ea816749a9745515bb153adc52ed4b