Merge "fix issue when cancelling OEM unlocking change" into nyc-dev