[automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: fe42418de4  -s ours
am: 6141ad5079  -s ours

Change-Id: Ic02e2b1985465acd6ff0d29fcaaca94859d6297a