[WIP] Forward port PIE controls from CM 10.2 into 11.0 (2/2)

Intial port by @cristianomatos

Change-Id: I5abb7fb25878bd16a5549583b5fbf01c4b178c0c