Merge "Adding thread safety to proto uploader"
am: 72a0ffe9c1

Change-Id: I3fbb545b17abea8cc5a11bbabbd224c573a25040