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

Change-Id: Ie61bcffacd2eddc94dadecc76263ce1c19d99d75