Merge "Adding null check to prevent crash when factory resetting device. (5214968)"