Merge "Update help commands" am: f133fac48c am: c8bd2f01ce
am: bb4121b34b

Change-Id: I0b5099eb8f25cf0dcbe800d9f315cf9bd64938e2