Merge "Disable AVB check in runtime vintf"