Update oslo code

Change-Id: I90b7488c12dca10a0ba5d46f809ed448b17035e4