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

Change-Id: Idae772ec400678fa409793940551af634da1be30