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

Change-Id: I02b3ff391b10ed1f2ced5b7149c77b68b90fa63e