Merge changes Icd59f53e,I80200320 into main

* changes:
  [MetadataSyncAdapter cleanUp] - require nonnull for non nullables
  Add util to get package name from runtime metadata schema