Sorry it is a bit ugly, it is to allow this change to be checked in prior to the first stage of the framework change without breaking the build. Change-Id: I1828579019ac0325d19c070a4c62cd79549e7d51