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

* commit '66880a90e41ab449252a4aa02beb4b9ec42f9028':
  Stop using the PLD macro.