Merge changes from topic "am-016e80a61e3c432b8a1915663d9a8fb1"

* changes:
  Merge changes from topic "am-8d673f3fe8844346b58e11d8ef00c99a" into oc-mr1-dev-plus-aosp am: 3a96381c69
  [automerger skipped] Import translations. DO NOT MERGE skipped: 4cd0777c01 skipped: 03130e4fbb am: 0a09cd4b21  -s ours am: cd4371f3cc  -s ours am: ea52aec628  -s ours am: 1ed0a31ee3  -s ours