Prepare for OSR

Change-Id: I07de388d355db053e79877c995f26af1900478b6