[automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 355dfa6850 -s ours am: 071424bf41 -s ours
am: 22cf5296bf -s ours
am skip reason: subject contains skip directive

Change-Id: I3285dcf94f875aac3ce6bbf8b11da4c183c6a9a0