[automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 4d9bb53904  -s ours am: b2437b158f  -s ours
am: 91aec57d67  -s ours

Change-Id: Ice38f4500750734b9ec3e5969da2b5d3643a9f58