Merge changes from topic "am-f5e1ab0936be49f5be84d3c326e7f8fc"

* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 6f09916f -s ours am: 3512ebb5 -s ours am: 773f48ba -s ours am: 1856648c -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 72d58640 -s ours am: 0890e485 -s ours am: 7ed996df -s ours am: d385d2f8 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1f4237da -s ours am: 99d07e12 -s ours am: 8cbbe622 -s ours am: b325ba1c -s ours