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

Change-Id: I7d55285b2e0ee1b949df253c5703be874fa21f63