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

Change-Id: Ic8be0cb9b49ae27e03111a3efd8f07160ade3243