Merge "hwc: Bandwidth check upgrade."