[automerger skipped] Merge "Modernize codebase by replacing NULL with nullptr" am: cc4bed2f3d  -s ours
am: 2ee4a2a2bb  -s ours

Change-Id: I6a4ce6a63ae7f3d241fb408451763ad83a35e1bf