Merge "Modernize codebase by replacing NULL with nullptr"
am: ca701c3e16

Change-Id: I7d99b43377f84d47b7cb8b02d340d08f83b9b5a3