Merge "Update for expanding @2.0::HealthInfo."