Merge "Remove `emergency` from the `fastboot reboot` completions." am: 243be559a1
am: 32a4750ba2

Change-Id: I480f6a089ffe5146f2747f5f8702085864c028a7