Merge changes I55eee605,Ibd4a0dd7 into main

* changes:
  Merge tag 'v0.0.5' into aosp/main
  Merge tag 'v0.0.4' into aosp/main