Merge "Address review comments at aosp/3249945" into main