Merge "Add support for updatable services" am: a07d2959cf
am: 0f63824377

Change-Id: I00ec3418842ee6be38a087e12dc115050e1afe53