Update latest OSLO code

Change-Id: I804d1eae92e89740339546f0d0f490a3e4f21204
Merge "Update latest OSLO code"