am d51ffa04: am f3f5bce2: (-s ours) am 6a701bd9: am b53b521e: Merge "Add `adb features`."

* commit 'd51ffa04441e6ad17f2146a5d547f4cb852a26d0':