Revive psmodule.

This is partial revert of Iad91fe9b25cd5b183a6861a0b5fd79a60b93cdb8

Bug: 36638120
Test: Manually done
Change-Id: I0042a34b15aec9fe712659689cc65cfbefec776e
3 files changed