Settings: We want to be consistent (PIE)

Change-Id: Ia0e71edd8c0987c9ec6d70bb98da824a8016c243
fixes

Change-Id: Id1bcb63b058e65fdc91eaecf9378e78d22cf3912