Merge changes Ib9a1af0c,I807496ec into main

* changes:
  Use OnceLock rather than Once.
  Add safety comments to binder tests.