[automerger skipped] Import translations. DO NOT MERGE am: 332e8f4e81 -s ours
am: 14b68c1231 -s ours
am skip reason: subject contains skip directive

Change-Id: Ibff41789e28aed1039e937beb0bb3d24e51d10c1