Changes to support RuntimeService in framework
am: 3e50073371

Change-Id: I51dc54f4168133c5175bef986b4c832ff3ee5f7d