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

Change-Id: I35d278036e18296ee30ad8f35e65a7a4b8c55f15