Removed useless "while" loop

Change-Id: Idc8ebc3a90f10f2179fcea0872207fe17cc2b265
Merge "Removed useless "while" loop"