[automerger skipped] Import translations. DO NOT MERGE am: a9cb853e1b -s ours am: 1c0e23efbe -s ours
am: fb9e969c2e -s ours
am skip reason: subject contains skip directive

Change-Id: I267155d8fbd600f061c8f71299d35d3b8c624380