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

Change-Id: I7ca415499cfa2231830e183f03a5251acdbf56fe