Merge "Gracefully handle integer overflows." into oc-mr1-dev