Merge "DO NOT MERGE: Tune up kMaxStopCompleteWaitMs to fix NE"