Merge "Update the proper App battery usage string on App info page" into udc-dev