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

Change-Id: Ic22bf13545f1261f288dc47df9ee123913ad8028