Merge changes I7ea39b80,I6b9979f3 am: 310d1dac0d am: a27e14c240

Change-Id: If8cd7bd2c1fe4b698113eb761ed8e2b4f9580cf0