Merge changes I8e8799fd,I4626262e
am: 6f7d6f1bc3

Change-Id: I34ddda44db09e45c7f5b4c487615e783acea99e0