Revert "Revert "Fix lifecycle issue in CommonPool""

This reverts commit 162305aaceca5f6cbaa03db1aa124f67e313612e.

Adjusted tests to ensure they pass on cf_x86

Bug: 129250875
Test: this on cf_x86 & blueline

Change-Id: Ic3245ec8db784ae356b7fa66dda9a2fc91c622ea
3 files changed