[automerger skipped] Import translations. DO NOT MERGE am: 00f87b1416 -s ours am: e3e04325d9 -s ours am: 7d3b9fe39e -s ours
am: a31f0bbe2c -s ours
am skip reason: subject contains skip directive

Change-Id: Id5c7b24ea00f3d78f6bfa412a0685121dc22b383