Merge "hwc: Reset PTOR information"