Merge "Fixing bug 2411394 - Monkey crash due to incorrect test service manifest"