[automerger skipped] Modernize codebase by replacing NULL with nullptr am: 5f765b86ae  -s ours
am: 62a94ada3b  -s ours

Change-Id: I38b494d783f2a2785c24635d976be256aecfd2c7