Merge "Replace NULL/0 with nullptr"
am: a160f5a70f

Change-Id: I298ccea470e3bc6bed3fcf6e3e03a2f0d720ff7e