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

Change-Id: I93b40b819ec967bf19c0f28e0a4f26f4db0fe50b