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

Change-Id: I20c1f8e9bd48bfbdbb3f38d12cec0f074ae19dd5