Merge "targetSdkVersion float property sanitization"