[automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am: 06cc4df53e  -s ours

Change-Id: I0609ccd1ccf2cbe85fd9c6cf03cf0b65f5bc7350