Merge "Improve codegen slightly when doing FD validity checks"
am: 9ad079ba58

Change-Id: I4262f086b9041bb28536cf2c7598817fac63b8cc