Apply PST when generating diff

Bug: 52345
Change-Id: Ic676105d230baf77994224bd64ed40cb52bb2e8b
Merge "Apply PST when generating diff"