Merge "Fix bug 6930875: ArrayIndexOutOfBoundsException on Battery details" into jb-mr1-dev