(cherry picked from commit fe022ed795)
fe022ed795
make vmui-update vmui-logs-update
25a9802ca4
8657d03433