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

Change-Id: Iffa9e589502b1b310e8adf7b5005aafe9e39c73d