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

Change-Id: I2b80fdb701baf901fee18e986a483085a3143782