Merge "Add AOSP certificates for connectivity resources"