Merge "Expose Handler APIs as @TestApi" into main