Merge "startop: Fix comments in gerrit CL 9172239."