Merge changes from topic "revert-26719621-VJCEHBBDKS" into main

* changes:
  Revert "Aslgen tests"
  Revert "Adding more supported fields/logic to aslgen."