b0c9d043d4
Merge in cros-ec changes applied through MFD branch to resolve conflicts.
Merge in cros-ec changes applied through MFD branch to resolve conflicts.