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

Change-Id: If4de2dff5c3b4a253529f52a2c2af118147b1961