Merge "Update to support Conscrypt sync"