Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 69dd99c741  -s ours
am: 932a818776  -s ours

Change-Id: I69cc4dc851739b9d09bd82790c0a9202922a5a28