Merge "Fix full draw  power usage increase issue"