Sync Oslo code

Change-Id: I9782f235d09ed2d66add23e4db7a892066cdf0cb
Merge "Sync Oslo code"