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

Change-Id: I2e43884e9fda71b912361b12c5d26873ccd92953