am bda5cc16: am 0ad14266: Merge "Replace NULL with nullptr"

* commit 'bda5cc162fc33121cb89503446ff0e743ebf271c':
  Replace NULL with nullptr