Merge changes from topic "am-f5e1ab0936be49f5be84d3c326e7f8fc"

* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 45cad6c4 -s ours am: e8196d8c -s ours am: 3b81a759 -s ours am: d84005a1 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9fbb964b -s ours am: 181f2722 -s ours am: b85ed6e3 -s ours am: 20794b05 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: f3a8bca2 -s ours am: 477efa1a -s ours am: 52fb8966 -s ours am: 9b026955 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6ee17cb5 -s ours am: d928ad6f -s ours am: 6d123c80 -s ours am: 32dc03ab -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 55248fe9 -s ours am: 4f4e91ab -s ours am: d6189d3e -s ours am: c29ff581 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8c29fdbf -s ours am: 006cadc0 -s ours am: c3a6368c -s ours am: 623f70ae -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 016ddd89 -s ours am: 55c883e5 -s ours am: 510d58c7 -s ours am: 28fa9f89 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f443ba5b -s ours am: 9b7064bd -s ours am: 49940aaf -s ours am: cbf53683 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: d707ddce -s ours am: d0cde3b3 -s ours am: 34437c15 -s ours am: 001292aa -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 42c15f18 -s ours am: fa060284 -s ours am: 77c7b35c -s ours am: c0124c16 -s ours