Merge "health: support Dock charging"