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

Change-Id: I6aeb111fd45b9cd1936f032a67e2b8739aa37cd8