Merge 'origin/upstream/main' to 'origin/main'

Change-Id: Ic33ce959b0334318b247c5f9dc4372c22389f6d4
tree: ec9a036528be32a7018960095557241ba22e65ec
  1. liblog/