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

Change-Id: Iaeb1020ba5420fc0abeac2e680c04f1a7b503a15