[automerger skipped] Import translations. DO NOT MERGE am: 3c7f38067d -s ours am: 0434b59d42 -s ours
am: 48bb823b81 -s ours
am skip reason: subject contains skip directive

Change-Id: Ifadba5cf31a98963375d4ece4116976accc744d0