Update Oslo

Change-Id: If04ef50de0e3f41574058c37b390560f1980d381
Updated from global requirements

Change-Id: I597531b56860a208d829ec373cb3d0034b41fbd5
Merge "Update Oslo"
Merge "Updated from global requirements"