Merge "Add initial support for RuntimeService" am: c12698952b
am: 88b3992bad

Change-Id: I9f193daa0c743aa24c0a967889d5659bea2fe2fa