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

Change-Id: Ie7dae1fb734dcc8d18edf0e057ba460e86d67233