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

Change-Id: I9fe9e16566a02717be5fa8beaa47a4fd7d460c8c