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

Change-Id: I78bbc45aa215f7620224d4e7cd121131a9b34700