Merge changes I0946b440,I6a9af104

* changes:
  harmony: more removal.
  harmony: more overlay removal.