[automerger skipped] Import translations. DO NOT MERGE
am: cf0305126e  -s ours

Change-Id: Iab985c4b58208fbd669d79468895e1673e95ead9