Merge "Modernize codebase by replacing NULL with nullptr" am: 1f077d9045
am: 9c05f1ebfe

Change-Id: Ic383addee899f9a0184dd6ae4671610c7f87eacb