fix stop components bug

Change-Id: I407096552fc957e44940dec534be543d0bdcbc5f