Merge "[cmds] Modernize codebase by replacing NULL with nullptr" am: ad0f33eaf1 am: 9ead54bed6
am: 15f7302e94

Change-Id: I12d63c3154cf91b17cbab1755fb809221eab0c17