Merge changes I8d0f5341,Iced0de7c,I742cd614 am: 7b46197bc2 am: f59395aad1
am: 81e13b8d79

Change-Id: I2665020b5c749767bb85259e4d5a26e68fa81e2f