Modernize codebase by replacing NULL with nullptr am: e353f25791
am: e5f8733e8c

Change-Id: If81dfe3b93d68167f583caac893563c8ca29c4cb