Merge "Add initial support for RuntimeService"
am: c12698952b

Change-Id: Id3d0e82eb38d17152a4d2cccd5253f8ecec1da09