Merge changes I16ea9e32,Ib53b5d3e
am: e20f357f4f

Change-Id: I591581a1a0b91f387264864435f9d922db25f55c