Merge changes I2b4d2763,Ieeb40d03 into main

* changes:
  Update the ownership info for the /am directory
  Update the ownership information for the apex/jobscheduler directory