Merge "Refactor the codes to call wipe_data/wipe_cache functions"