merge : Remove lock from metadata proxy, avoid deadlock in agent

Change-Id: I7e2d102fb15074fbc0b0a224bb60de1ff55add00
Merge "merge : Remove lock from metadata proxy, avoid deadlock in agent" into R1.05