am 6b5f77c9: (-s ours) am c583c511: am 186f1dee: Merge "adb sync cleanup."

* commit '6b5f77c9bb0923e0072651a52a500c8c10b4d32b':