Merge "Delete @removed-at-birth storage APIs" into main