prepare for OSR

Change-Id: I5c16e5aa601e6a365af1d45acea9535b3c864aad