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

Change-Id: Ia5bc9bfaf3da6a8819bd549d1c08300a260c695d