RaduBerinde Merge pull request #16520 from RaduBerinde/update-apd

update apd

Latest commit 2d9abc8

Jun 15, 2017