Merge "remove check for obsolete property ro.config.sync"