Oslo incubator updates

Change-Id: I9559d8a6d59477f6b5ba3f82ab9ecf9b71b75f70
Merge "Oslo incubator updates"