Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 0bbfc26ecb  -s ours
am: f83dc01d39  -s ours

Change-Id: Ibd10986f74a2da231ebb892985e2fba6fecf6312