Fix FC's.

Change-Id: Ibc30b8c448a6b181ee5904d76f79e56d5f2b438a
Add this to grouper not here.

Change-Id: I60093a390ddd18fdcf0e1e415f84fa41f7977595
Revert "Add PA overlay."

This reverts commit 6d5c90e7b4a722e623f9ced806ebc19d4f6b08d3.