Fix warnings.

Change-Id: I9f884977a05b63d4654d9dfcd000e73217a31311
Merge topic 'cleanup_commandline_options' into next

51501fa Fix warnings.