Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: ba09ef4367  -s ours am: e4dc563787  -s ours
am: 019ed9de21  -s ours

Change-Id: Ibe879d5ed4a77c2d194a8deef7d7626efad26e4a