Merge commit '3bd5e2b22efe0da3864bc6d8c5aae68742c3c707' * commit '3bd5e2b22efe0da3864bc6d8c5aae68742c3c707': Add better APIs for the battery status, and other cleanup.
Merge commit '3bd5e2b22efe0da3864bc6d8c5aae68742c3c707' * commit '3bd5e2b22efe0da3864bc6d8c5aae68742c3c707': Add better APIs for the battery status, and other cleanup.