[automerger skipped] Import translations. DO NOT MERGE am: 693e8cb402 -s ours
am: ac154963e2 -s ours
am skip reason: subject contains skip directive

Change-Id: I1e8576f0f23038b462843e688bdd4725a736f592