Merge "Add instrumentation data to host proto lib"