Merge changes I99d46a2c,I6ff460d0 am: ef9835967a
am: 45415605b6

Change-Id: Ic790e609566cb2e35c81b2cf1b5fd2742579135a