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

Change-Id: Ic3d74dd044e7da852eeea96744c209d3741a00d5