Update oslo-incubator

commit 569979adfd4237869bb50c7aaa02bc3fd4f0b413

Change-Id: I0096b7f0c9fe15014982801ceee2170e4d364fd6
Merge "Update oslo-incubator"