PIE: preparations for gap

Change-Id: I1059186b93e31c622f5c3fb4ebdae1b9b27b4060