[automerger skipped] Import translations. DO NOT MERGE am: 508b5486f4 -s ours am: 06ad738ac3 -s ours am: 3f519896d2 -s ours
am: a082691ade -s ours
am skip reason: subject contains skip directive

Change-Id: I6deb464bb6dfe1bcecfd5d9c96993bf54a4b2895