Merge "[1/3] Remove unnecessary throws statement in ServiceManager"