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

Change-Id: I9fadaed610a33be82f71e6f230f2c5f41b8f8a55