Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 417d745e6d  -s ours
am: f642db22e1  -s ours

Change-Id: I3143f7e9a2124e658717081e720945f826a6ce00