Merge changes from topic "am-6558352ede11458480664f3efb34ecb9" into udc-d1-dev-plus-aosp

* changes:
  [automerger skipped] Merge "DO NOT MERGE Fix BAL via notification.publicVersion" into tm-dev am: 487726ad am: 53692d21 -s ours am: 475e4a24 -s ours am: 9efcf576 -s ours
  [automerger skipped] DO NOT MERGE Fix BAL via notification.publicVersion am: 1896c2e7 am: 839b9076 -s ours am: 3b3c2e44 -s ours am: c2ec6666 -s ours