Merge "Relax an assert in AssertPcIsWithinQuickCode()" into oc-dev