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

Change-Id: I44a2fcad7ce27350d110263ce2083b489bb47762