[automerger skipped] Import translations. DO NOT MERGE am: 9781a780e4 -s ours
am: 3f81ee5f55 -s ours
am skip reason: subject contains skip directive

Change-Id: Ib65073f9a1161dba172d249004409041d8c604be