Merge "Add support for updatable services"
am: a07d2959cf

Change-Id: I97d2f0b8379968ddcffed568b21c336a346a6281