Merge "Change "Advanced battery usage" to "Battery usage"" into pi-dev am: e6825db406
am: 7f197d9c73

Change-Id: Ife74b5006b56e7c836af24b48b9350a779e72efa