Sync w/ downstream keystone changes.