am 57257089: am a4ed15ee: Merge "Stop using the PLD macro."

* commit '572570892643bc681b0b7dadf48c19975cace555':
  Stop using the PLD macro.