Merge changes I82aa8140,Ib62a5dd6,I2c4d64e2
am: 313e645801

Change-Id: Ia10d20ea4ebabc2cc84524950dec7570104b185f