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

Change-Id: I904dccb993749ad1e7b79f5b6d66369d3ea7224b