Prepare for OSR

Change-Id: I5dd7836c3695e96a36b1af9b4379085d311da120