Merge "updater: Check the number of args in Command::Parse." am: 95b8d2b064
am: 42f96e5516

Change-Id: I112be68943872b9398e49367b350112e4eebcdfd