Merge changes I7f1ef2e8,I498bc261

* changes:
  Convert sysui to bp
  Cleanup trying to move to bp