Merge changes I85f365f5,I2b3c82fb,I4f196054,I9343237c,I53e4444f, ...
am: 84155ed95f

Change-Id: I2778e3618e7c8ac4445bb7d4a7f92fc9ba3ffbc6