Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 06a47f450a  -s ours am: 2c97d049c2  -s ours
am: afc72a639b  -s ours

Change-Id: Ifcd115a90c7b97750712d1ca4a7b2d98e9d96872