Final OSR

Change-Id: Id2d210bbbc0360ab6b5d96ed6477d1466affd463