trq-2274 cleaned up cherry pick.
trq-2274 cleaned up cherry pick.
Cleaned up unit tests.