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

Change-Id: I64a8577bed17e10d79dbdb86fd6f224b3d4487ce