am 0d103b59: am f2f74ca6: Merge "Remove references to obsolete pmem functionality."

* commit '0d103b596dd9883898a062beaacf980d4439b835':
  Remove references to obsolete pmem functionality.