[automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 890bcfa7ac -s ours am: 132a22ecec -s ours
am: c75cf1f0c7 -s ours
am skip reason: subject contains skip directive

Change-Id: Ie33d521914a2181598c2af34443f5b84a477f81a