Refactor OSR related code to prepare for "true" OSR.
am: 57cacb720e

Change-Id: Ieb13adebdd5a9f9664a2bbc16bfbeec3960a749c