Disable fast charge path for now

Change-Id: I85f8c1cefbb775d577fbb7bcc458c7c97bd56c37
Properly correct this build error

Change-Id: I71f273482594402bd657d1f59c99b4293b0a5386