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

* commit '76d0b79e5c9665096ebac525531b50f5fc55ea57':
  Provide final callbacks before remove CustomContent (issue 11169651)