Final update OSR

Change-Id: I977023cb5bfe69da7072397c0b0bf10439761ace