Update Oslo

Change-Id: If04ef50de0e3f41574058c37b390560f1980d381
Merge "Update Oslo"