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

Change-Id: I1d6c54f9c2ab8035115103772702e4d177a8c3b4