Remove usage of locals() from manager.py

fixes bug 1171936

Change-Id: Ic137327b8637104cd4b330850becd80ba20c1e1c
Merge "Remove usage of locals() from manager.py"