Recommended way to work with loops is now using loop. Change-Id: I4ce186e16e6ae5b3a6f29542887431f5499286b0