Merge remote-tracking branch 'upstream/main' into main

Change-Id: Ie12a35a4bb43632b552f8b8b7b138bfa99d6cb99
tree: d5eab19277e82a40d6b6ec990fb102701425d96d
  1. libs/