Fix scale down cluster

Fixes bug: #1285533

Change-Id: Ib0d144ce81dac8ced7d334aa496a49e0f4837504
Merge "Fix scale down cluster"