Merge "Inject the BroadcastQueue created in the test into AMS." into main