Updates latest OSLO changes

Change-Id: Ief4a24a620b798bf8ece393e90c292c8121ae280
Merge "Updates latest OSLO changes"