Sync oslo

Change-Id: I4bd4e03857e7812748a32110c401451a9617c560