fix fip cases

Change-Id: I1cebbb9cf53f6d019dcdd4dd9ace07767342cae4
Merge "fix fip cases"