Merge "Synchronously update APs in during forceUpdate." into oc-dev