Merge "Replace NULL with nullptr" am: 82c9209b7a am: bbed0426d0
am: 5cb521ed55

Change-Id: I7a9d3497c2d4e5e8a7f6833d03d1d2b9871e5fc6