Fix locking issues with proto dumps am: b57b01e59d am: 52d123c960
am: e0cc72f3ce

Change-Id: I6aef28686c50d32a461ad666ac7cef3dcc3982ee