[automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: a68185d54b  -s ours
am: 6791b9c62e  -s ours

Change-Id: I7f2119bb0d15063cd3956923fe3cb5b3b3e383a1