Allow FMQ to be double-loaded am: e720c0aa82
am: 7d9ac43ea6

Change-Id: Ieeddab6c7bd5b4d0ec929d2df897a58baa9129e7