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

Change-Id: I305e5f1061c37cdf77f5b96734e8c28b02e1c782