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

Change-Id: I4e0503059e3ef133fe47adc48f099d3e328991a2