Fixing wrong commit with Cluster Template Flow.

Change-Id: I4216fde761c962d7bafc9b9339f6521c78f79676