[automerger skipped] Merge changes from topic "b/132083376" into oc-dev
am: d082cf4d28 -s ours
am skip reason: change_id Ic6e5053b369ead645293c94854431b1c17ed6431 with SHA1 9f6aba10da is in history

Change-Id: Ia2d53c985b317654aaa15d3b9738aff2bc0ce610