Merge tag android-5.1.0_r1 into AOSP_5.1_MERGE

Change-Id: Ia0126aa448caa7ce354ee19539ab864617efc629
diff --git a/bash_completion/adb.bash b/bash_completion/adb.bash
index b9b52c7..c1793d9 100644
--- a/bash_completion/adb.bash
+++ b/bash_completion/adb.bash
@@ -59,7 +59,7 @@
     fi
 
     OPTIONS="-d -e -s -p"
-    COMMAND="devices connect disconnect push pull sync shell emu logcat lolcat forward jdwp install uninstall bugreport help version start-server kill-server get-state get-serialno status-window remount reboot reboot-bootloader root usb tcpip"
+    COMMAND="devices connect disconnect push pull sync shell emu logcat lolcat forward jdwp install uninstall bugreport help version start-server kill-server get-state get-serialno status-window remount reboot reboot-bootloader root usb tcpip disable-verity"
 
     case $where in
         OPTIONS|OPT_SERIAL|OPT_PATH)