[automerger skipped] Import translations. DO NOT MERGE am: 5c7f635e3e -s ours am: 954d610873 -s ours
am skip reason: subject contains skip directive

Change-Id: Idf42c9a38d9057724bb94fa0666aed9f3ddc1600