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

Change-Id: Ia329a3bede2227a4d57159d494b27504bd98549a