Merge "Lock targetSdkVersion to 25"