Merge "OemLock HAL"