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

Change-Id: If50c189f59c491c9550e586206920146ad49f528