Merge "Battery optimizations for proactive sync" into udc-mainline-prod