Ensure we can always enter OSR code am: aedc9bc5eb
am: 44f84f05b5

Change-Id: Ica1e6ac8f19d3665f15ea2650e1394bdfa341f16