[automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am: 6ae6c7061a  -s ours

Change-Id: I4210d8bc6277f12d314675e641fd437dc7bdcf2e