Backporting patch for cluster stats

Change-Id: I074d5e1226b5d8b50e71376410d7cc4c75e1d9cd