Sync with Oslo 30a50c8a

Change-Id: I2614b234d0d59b698ddefbeb87541867843848b2