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

* commit '9eb0497b9554db715a9f011be3a5f0cfaf0738d7':
  Replace NULL with nullptr