Merge "Upgrade parking_lot to 0.12.1"