Get rid of cycle iso rebuild

Change-Id: I0c628ae1d02c1ccc572d299190d05b3b00faaad7
Merge "Get rid of cycle iso rebuild"