FILS: Revert FILS specific changes for Compliance Test Suite

Change-Id: I7d804589b0424bf02d4bf00897378c797e467476
CRs-Fixed: 2677031
3 files changed