[automerger skipped] Import translations. DO NOT MERGE am: db6406c65a -s ours am: df94436f04 -s ours

am skip reason: subject contains skip directive

Change-Id: I9acd062586f70ac32adb1e90ba2a37a9775735ec