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

Change-Id: I6cb867e68f1c64ac1620171a99df4c0e001480ec