Schema fixes related to AM and PM delete APIs [#56351860]