Changes to support RuntimeService in framework am: 3e50073371
am: d5716c0321

Change-Id: Id3af03bc911c45e90fd0c9acbf95399b98aeb161