[automerger skipped] Import translations. DO NOT MERGE am: 4712246f85 -s ours
am: a0732755c2 -s ours
am skip reason: subject contains skip directive

Change-Id: I6984952d13114e2384197a6697630f42c68dfd9b