Update with latest OSLO code

Change-Id: I54c0f6fa0489f0ef20187adf87f720e48ce1626c
Merge "Update with latest OSLO code"