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

Change-Id: I2bb706433c501f0c1fc1bb0786718bfae8dfb339