Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am: dfd4523ad3  -s ours

Change-Id: I77e69494ee00130c10dfd861669c284464e1e09e