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

Change-Id: I86c93c0efd140be0629ef37a799a284d0f22b629