Merge changes I7c418811,I0870eae0 am: 88fb149b8e am: df6cb83d97 am: 569b010860
am: 5157d11da1

Change-Id: Ia4254ec14739ea574e1b7384cce1a6e56877ee59