Add missing command line completions support am: 9950627b1b
am: baa4175c5e

Change-Id: Ic9d9463ba18fbd3fad8182d3d4a6706195c772be