Sync oslo

Change-Id: I8b55bed1a66b8a0e769a0d70fea849f8e6db79e8