Sync with cinder g2 changes.