Uppdated protobuf generated includes to fit with the current android-client software