Merge "Make doze vars volatile to be thread safe" into main