Merge changes I7ad55374,I4a0c7f6e into main

* changes:
  Add test to verify callbacks for enable/disableInterface APIs
  Fix enable/disableInterface APIs to properly affect administrative state