Merge changes from topic "am-3606a5e21978498eb7b6d0040eb1a22d"

* changes:
  Merge changes from topic "am-56dd07c8eceb476bbfad59becddc1ba1" into oc-mr1-dev-plus-aosp am: 33fc64360a
  [automerger skipped] Import translations. DO NOT MERGE skipped: 2c3e611a18 skipped: 218841a6dd am: 8eb39fb0f4  -s ours am: a8e2306430  -s ours am: 6ccac2ffc3  -s ours am: 6e0c678836  -s ours