Sync with Oslo 30a50c8a

Change-Id: I12a39aaa506d0938e742285d97c4bf28e21dcb2c