[automerger skipped] Merge "Replace NULL/0 with nullptr" am: a160f5a70f
am: 83af600986  -s ours

Change-Id: I7487cb843f2973f81c9168363451a83f115169f2