Merge "Fix functional test for startop."