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

am skip reason: subject contains skip directive

Change-Id: Ibf945e281124039432574c8184e2a9ddfdd9ea5b