Fix fastcharge toggle

Change-Id: I8ed1fed71c3182f6d648879394c8c1b63fc324f4
Merge remote-tracking branch 'upstream/jb3' into jb3