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

Change-Id: I94270a76e569bac1356a9fb505f10b59815594ab