Merge "Disable DB wipe check"