[automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: d517cdb2 -s ours am: 5686e715 -s ours
am skip reason: subject contains skip directive

Change-Id: I269314dae2993ed056c90a05911576289024f06f