Merge "Tweaked BagOStuff::lock() retry times slightly to be faster"