Merge "Relax an assert in AssertPcIsWithinQuickCode()" am: 82c6933a59
am: 43258ef289

Change-Id: Ie984057c243070ae0165d33f9113edd997a6299a