am 186f1dee: Merge "adb sync cleanup."

* commit '186f1dee2afc15c8941a1f78e1aa97e2ec9970ee':
  adb sync cleanup.