Update latest OSLO

Includes fix for bug 1158179

Change-Id: Ifd8cde2903dcd013903e95a30c2ed422e89bcd0f
Merge "Update latest OSLO"