Merge "Enable liblog_stub to work with variable tags" into main