DO NOT MERGE Add ability to add interop entries dynamically (1/2) am: 0a778c30fd
am: edbcc9a862

* commit 'edbcc9a862771e1ce78077e744119011ec58a92b':
  DO NOT MERGE Add ability to add interop entries dynamically (1/2)