Merge changes I852b4daf,Id648eaed
am: 346285b558

Change-Id: Id1c7bc956e0c64620a030edd72a3a8bb3831a712