+ convert while loop into for loop

To check:
could we use std::find (find_if)?
Is it always ok to do begin()+1?
What about if we return aEnd?

Change-Id: I59107de5693ad7b37e5eef80134c34a03982151e