Merge "Refactor update status management as protobuf"