Options help text improved

Change-Id: I409b25a0767df053a3e80dcef467e99ac30417e4
Merge "Options help text improved"