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

Change-Id: I119864fe230b48d92caadc05ee69c008c7a35657