Merge "Modernize codebase by replacing NULL with nullptr"
am: 35bb46188c

Change-Id: I0d021686fff922b5750c66c60a66e460dc55615e