am 32a660b3: am 523def1d: (-s ours) am ac85cf78: am f8342a9e: Merge "Allow multiple serial numbers in ANDROID_SERIAL." into studio-1.4-dev automerge: 75f8bef automerge: 849a260

* commit '32a660b3a399a0e03e1fdb8e930e6e0871524bc0':