Merge changes I99d46a2c,I6ff460d0
am: ef9835967a

Change-Id: Idb152d83539872f176a0382f8aeee3f9a60b0b26