Merge changes Id51dcb18,I2517dcb9 am: 4db472b779 am: aa3c3fc3be am: 4b32a1f8b8
am: 806ca1a1b0

Change-Id: Ia93bff9a5f86d78d2c1cb18c3e3d0bb5276b1e8e