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

Change-Id: Ia3df985df132e1ce80bdbe0920c7738b5c8a2ccf