Reconcile active_map and cyclic refresh

Change-Id: Id7f8654aeeb20caa402bc822521b1d72c658f4f9
6 files changed