Merge "Guard against pssh overflows" into mnc-dev