Specify required options in descriptions

Change-Id: I88a64508956a3f8c99efe249f60f998febe7f935