Merge changes from topic "am-9b939336c0334437acbd57592fc2ea1f" into udc-d1-dev-plus-aosp

* changes:
  [automerger skipped] Merge "DO NOT MERGE Fix BAL via notification.publicVersion" into rvc-dev am: ba41b02d am: 4e16b6b4 -s ours am: 46f540cb -s ours am: d5337369 -s ours am: 30354234 -s ours am: 18bace29 -s ours am: 0713b8ce -s ours am: d80debe6 -s ours am: 30aabba4 -s ours
  [automerger skipped] DO NOT MERGE Fix BAL via notification.publicVersion am: 75fcbb37 am: 0e60d064 -s ours am: b8835cee -s ours am: bb1253d1 -s ours am: df82e3f6 -s ours am: 70f32f6b -s ours am: 2c6bc42d -s ours am: d6f987ec -s ours am: 1c09e77d -s ours