Merge "Revert "Add VehicleMapServicePacketReported and"" into qt-dev