Merge "Merge "Synchronously update APs in during forceUpdate." into oc-dev am: 6bdbc4abec am: 17bc64597c"