[automerger skipped] Import translations. DO NOT MERGE
am: 4712246f85 -s ours
am skip reason: subject contains skip directive

Change-Id: Iace10c1adc9040d704c9549e58a8f59f55d65afc