[automerger skipped] Import translations. DO NOT MERGE am: 00f87b1416 -s ours
am: c5a1544b21 -s ours
am skip reason: subject contains skip directive

Change-Id: I807852c7e104d8ab8eec8d677bfc4682d8730070