[automerger skipped] Merge "Modernize codebase by replacing NULL with nullptr" am: 1f077d9045 am: 9c05f1ebfe
am: 2e0ed2524d  -s ours

Change-Id: I168fc6b9604d4533e824961f1cb36e64f478c1f0