Merge "DO NOT MERGE: Add a battery capacity value to the power profile." into gingerbread