Merge "Improve heuristics for detecting wireless chargers." into jb-mr1.1-dev