Apply the change on GPE too

Change-Id: I75bb766e7c3257087eb4ba2b76b384d0765d29c1