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

Change-Id: I72d0c6acc64adc5852e95f804ef7b7f4730b6e8f