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

Change-Id: Ief3fa9c34e3a1959e193d35cea0b0ace7168411e