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

Change-Id: Ib98d02c5e40de0f245fb303041a665b8ade6a4f3