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

Change-Id: Ieace78b21cd492e3552663e12f055ddae69c4ce2