Clean up local variable usage - Keystone

Change-Id: I8e5506e9d29879459158ef796854ce7a67107d89
Merge "Clean up local variable usage - Keystone"