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

* commit 'eec6e8a176af7a5767e143e83c9133bd1ee84311':