Merge changes I0416b952,I53785040 am: b082e3dcac am: be6bd95db1
am: 6a43605f98

Change-Id: Id395f9f36192f0360387b9a92611a04972633053