[automerger skipped] Import translations. DO NOT MERGE am: 465cd58e21 -s ours

am skip reason: subject contains skip directive

Change-Id: Id47e19005af61d2e11068af5b14bdf4eb1dc2702