Merge changes I6d1231e5,I89559cc6
am: 9220335a2c

Change-Id: Idb64d720b59abb8d0e14c2352b29c7a23800b357