Merge "OPP: Fix the NPE in OPP service when stop() is called before start()."