Merge "SDC to SO Northbound (HPA) change"