[automerger skipped] Fix locking issues with proto dumps am: b57b01e5 am:...
[automerger skipped] Fix locking issues with proto dumps am: b57b01e5 am: 52d123c9 am: e0cc72f3
am: d47dc2ec -s ours
am skip reason: change_id I8bb93e9b9f81faec59585b770eb7ba0fbcd9b51b with SHA1 8406fd78 is in history
Change-Id: Ib230a30f155476008b876a3d4d20827d1a9f4744