[automerger skipped] Merge changes from topic "cherry-pick-ops" am: 5520851051 am: 35b2602012
am: 8613a62726  -s ours

Change-Id: Ic70a2a8d761e201999077ed6aed644ef562aa68b