[automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: e4792b3964  -s ours am: 483468f6d9  -s ours
am: 1ba1044dc9  -s ours

Change-Id: I5e12bfeb99acbcdc7326aae00e3012becaca18e2