Merge changes from topic "am-316e93e25f2949298bb8753f40254621"

* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: fa7057a3 -s ours am: f601be5f -s ours am: a1b388ba -s ours am: 303fc42c -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 06298704 -s ours am: 727f1cc3 -s ours am: c8801068 -s ours am: 3eb2c5ae -s ours