Merge changes from topic 'b/31458381' am: 8d8545120c
am: fe0d0be9a9

Change-Id: I1675fb9c742c394299b5a490c7c7305459dc5d0d