Merge "Move battery stats loading to AsyncLoader." into oc-dev
am: d0ea1386ad

Change-Id: Ic9e7b20ab191224061a7c43f2292978daa43582e