Merge "Replace NULL with nullptr"
am: 82c9209b7a

Change-Id: I2f317f08636cbff700b1ca359de06ad6b92f3c4b