[automerger skipped] Import translations. DO NOT MERGE am: 7af5bede6d -s ours am: f26bcb1967 -s ours
am: 28255edbf8 -s ours
am skip reason: subject contains skip directive

Change-Id: I47fa7438ad839c4e73a4e28e27946b76fa3c6708