Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 69dd99c741  -s ours am: 932a818776  -s ours
am: 83d85047bf  -s ours

Change-Id: I6f34bb4b7cc5565c6eece31ef40008820e1ab9b6