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

Change-Id: Ic2d87fd7b49e6d46355d6972ba415424112a9632