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

Change-Id: Ica182ed32560b39cf30be09ccce802fbb0650354