Merge "Fix targetSdkVersion for NetworkStack"