step 2 towards backwards compatability

Change-Id: Ifbcf74314f92f6862dd50158d7d7ccf56545af77
23 files changed