prepare for OSR

Change-Id: Ic3b8674c82c0f4f88c74770f20522b2a0a2acc75