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

Change-Id: I876ff09e15f4e1107c8a37faae7baa7b0f0df1d8