[automerger skipped] Import translations. DO NOT MERGE am: ff9bcdbcd3 -s ours
am: 07145c6239 -s ours
am skip reason: subject contains skip directive

Change-Id: I4383f0dc65b26c48d7fc181caf574587abc5264d