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

Change-Id: I82c788390bf9e66eb2b880d0527d1e77dd6a4914