[automerger skipped] Import translations. DO NOT MERGE am: a9ee39f5cb -s ours
am: 785f8a21a6 -s ours
am skip reason: subject contains skip directive

Change-Id: Idcf2355955d334ebdb1e7de98540727b195122a9