Merge changes I58f904d5,Ie0bf7804
am: 6717a6f930

Change-Id: Icce72f30997a66e8251a34a313957fb3f9f3e0e3