Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: f58518ea9c  -s ours am: 84e782d4d1  -s ours
am: 574742b492  -s ours

Change-Id: Icd19acdc5fd6962dc829594cdf1a31768b6e63d7