Merge "Fix EarlyBoot & DeviceUnlocked."