Merge "Disable factory reset in DSU mode" into tm-dev