[automerger skipped] Import translations. DO NOT MERGE am: 822856aea5 -s ours am: 359571656b -s ours
am: bfa70ddd0b -s ours
am skip reason: subject contains skip directive

Change-Id: Id688cd067139a0aea3f90d3c349d909fb58e87ae