Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 0b555bb27d  -s ours
am: 9a82f273a8  -s ours

Change-Id: I97035ae01ff66cfd98251e5c93fd3c9f271b24d8