Prepare for OSR

Change-Id: Ibf873feb26bd822c98876a1b1a9645c6afdef0b7