Merge "Update TargetInfo.h from build 9499909"