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

Change-Id: If10833b148ed1988bc7ff7731fe615e58c86d6c0