Merge "Shutdown : Add factory data reset check for timezone persist file"