Clean up local variable usage - LDAP

Change-Id: I9545884eeabcd6c41f3cc5f091a71e726dc44e87
Merge "Clean up local variable usage - LDAP"