Remove lock from metadata proxy, avoid deadlock in agent

Change-Id: Ib6e0a598d95ba2c3250c2d533d0d92e0c96037e8
Merge "Remove lock from metadata proxy, avoid deadlock in agent"