Merge changes I347037eb,Iaeb79aeb
am: e8e484989e

Change-Id: Ifd0d33410139c5aefbca5c008cc2463fe071fb5c