Merge "Modernize codebase by replacing NULL with nullptr" am: ca701c3e am: 541dc18d am: 3b369969 am: d03f3e67 Change-Id: I4530d9f9342a44aa29c7f4d703855d420cb9483e