Merge changes from topic "am-4661055aab9748e7aab4b0ac1000f79b" into udc-d1-dev-plus-aosp

* changes:
  [automerger skipped] Merge "DO NOT MERGE Fix BAL via notification.publicVersion" into sc-dev am: 0f4454ce am: 92e29bc9 -s ours am: 283de987 -s ours am: afc27392 -s ours am: 5fe86dcd -s ours am: 1f1f58b0 -s ours am: 6fd0646e -s ours
  [automerger skipped] DO NOT MERGE Fix BAL via notification.publicVersion am: 8d839e49 am: 93100d60 -s ours am: 66264b5b -s ours am: fd3fd4d2 -s ours am: 17d0811a -s ours am: af4e9a55 -s ours am: 9aee703e -s ours