Merge changes from topic "am-d5debf8cc1614cc8bbe2373f67592bb2" into rvc-qpr-dev-plus-aosp

* changes:
  Merge changes from topic "am-eedfd1b48b8148d8b87aa8f7e122daed" into rvc-d1-dev-plus-aosp am: e1997bc7e0
  Merge "DO NOT MERGE: Keep old callback thread" into rvc-dev am: 4f5495ea9c am: 95acfb402b am: 1505ed8ba3