Isolate cluster check otpion to separate class

Change-Id: I016f0bc2cf33cf56b261bd16180a072a3bfa4d08
2 files changed