Sync with updated oslo patches.