Merge change I9bdf6690

* changes:
  Forces adb root and remount when syncing.