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

Change-Id: Ic6e4c0d10256b4ffe06d709c53fd8343b01cb356