Add missing command line completions support
am: 9950627b1b

Change-Id: I3aa16419f7dc860d3f999742911702690395bac5