Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: b9762351a3  -s ours
am: 00544de5d0  -s ours

Change-Id: I6f8aabe8b93dd3a81f615bdc33cd7ce8997a65e8