[automerger skipped] Merge "[cmds] Modernize codebase by replacing NULL with nullptr" am: ad0f33eaf1 am: 9ead54bed6 am: 15f7302e94
am: 54a7ab498c  -s ours

Change-Id: Ia62cd710c68cd2383a5ba65e1a4980c633351b93