Merge changes from topic "am-86bda938904a48d2bef5682138b9764f" into tm-d1-dev-plus-aosp

* changes:
  [automerger skipped] Merge changes from topic "cherrypicker-L48400000954920366:N08700001270826034" into tm-dev am: d67018db2d am: b9ab038918 -s ours
  [automerger skipped] Ensure callbacks are run properly on executor am: 905273c7dc am: 43838b3eef -s ours