Merge "Update help commands"
am: f133fac48c

Change-Id: I81aaa1c3f122529c9f1d728e20e50e0ed531976d