Merge changes I1f104422,Iada733bc,I1428eed9

* changes:
  remount: Refactor remounting into a helper function.
  remount: Refactor dsu enabling into a helper function.
  remount: Refactor verity disabling into a helper function.