am 50952d75: am 76d0b79e: am bb6fda6a: Provide final callbacks before remove CustomContent (issue 11169651)

* commit '50952d75e18133da65547eef48ffb45012d5c502':