Merge changes I96c7b02c,I461feeae,I6fcd8d75 am: a6bc0e3c28
am: b3133e45c6

Change-Id: Ice1da6354ef73b2b3c8553ba0368ecdfefb20096