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

Change-Id: I8309d3abed74346ae3ad83f7b77c0bc377d92b30