Fix overlays for cfx

Change-Id: I7da368f14277a757ffb518a334a35cc9bda19b10