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

Change-Id: Idaf7eeaa1750afdd395515f39b68e838cd90b723