Revert "Revert 2 commits causing pin unlock issues after reboot"

didn't work :(

This reverts commit fc06ca6de0f1857bb5f55dd28717b92e87dad3b6.

Change-Id: Iff34689a2a15a9c5e9608682799185571ce1bbc1
Merge "Revert "Revert 2 commits causing pin unlock issues after reboot"" into kk