Fix locking issues with proto dumps
am: b57b01e59d

Change-Id: I7a3e71d68b394357da98de6a9705f0d4cc180791