Merge changes I316c13e3,I4d99744d,Id9614b72,I7c98a0b7 am: a78b5b300b am: e0db940e52 am: ab6b6e2c3c
am: c3e9c2adca

Change-Id: Ib6e3b4b4a83a72115e200c39a4291fc14993a8dd