Merge "Don't include header size when checking for adapter size" into ub-gmail-ur14-dev