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

Change-Id: Ibfec2c461c31264dd31ffddbf938be364056eb50