Merge "adjust sad per bit constants"