Merge changes Id2a61d35,Ibe802c36 am: 3cf9f9b838 am: dff1cef8ae
am: 369082b55f

Change-Id: I2c7b42edb520e06ab27d81c45fdc8841d80af09e