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

Change-Id: Ie37ad318e3dedd1082a6acc63ef155fa604fb0cf