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

Change-Id: Ib52596858530bbd45b5a7b0140458a1299348316