Fix shadowed variable warnings.

Change-Id: Id9a4d2594f4a827b991f93ddc6a51ca1a1893956
Merge topic 'fix_find_data' into next

88dfa0ba Fix shadowed variable warnings.