[WIP] PIE 2

Original commit: da062dc61ce6285caad889a0b7abe3232cc03790

Change-Id: Ib7a5106f22e11b584d5ba26d089ec05b5f39e465