Merge "Change high usage detector logic"