[automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 3371f4323e -s ours am: 999db9b2fd -s ours
am: 72b6302cac -s ours
am skip reason: subject contains skip directive

Change-Id: I3f167e1ee1db3c55da5f6650e8a82074d841dcb1