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

* commit 'f3f5bce204d264970dcc91b8f0a4149174b4add6':