Merge "cmds: add #!s" am: 8911c35df3
am: 2c61e3de27

Change-Id: Ifb1e12b63312570b5451b0e548adf0a5d25c4010