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

* commit '83271127984e7f9006aed542e8d05f20dc63c4a3':