Merge "NOT_VCN_MANAGED - do not use on Android R" into sc-dev