AJCORE-1301: Fix concurrent modification error during shutdown.

Change-Id: I9d8b5d59bf6eb7794b4a5e3d2353ff4765c0cd3d
Signed-off-by: Todd Malsbary <tmalsbar@qce.qualcomm.com>
Merge "AJCORE-1301: Fix concurrent modification error during shutdown." into RB14.12