Merge changes If8668073,I92038175 into main

* changes:
  Merge tag '8.0.0' into AOSP
  Update version to 8.0.0.