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

Change-Id: I63c71388e294d512ac98231c5a702ddb025e73f3