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

Change-Id: I398cb75073db8c022df82b70de0a87fd0d5c2faf