fix fip cases
Change-Id: If9c6ffce11043fc2732078c0af771a9646d0a401
Merge "fix fip cases Change-Id: If9c6ffce11043fc2732078c0af771a9646d0a401" into R2.0