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

Change-Id: Id6b4f8e7e86be1a079058f336700c9fda7d23c0b