am 575a6c1e: (-s ours) am 246169c6: am 068a00f8: Android SDK Windows USB driver: Glass PID. DO NOT MERGE.

* commit '575a6c1ebe879eb31c36d19b8672296ac9c557dd':