Merge "Remove stopship workaround for instant app targetSdkVersion" into oc-dev