Merge "recovery uses IHealth::getService" am: ce2f0d85fb
am: c7c56f0e90

Change-Id: Ib96bc483a80a35a0b405c82cf623dfe7c2157ff4