Merge "Don't initialize sync sample parameters until the end" into security-aosp-mnc-mr1-release