Fix fip cases

Change-Id: Ia2540af094996c05b1a4dea0c5647bc09f8b9818
Merge "Fix fip cases" into R2.0