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

Change-Id: I2ecaab2b1546264cff2785bc5cfca2afcd666dd6