Merge "Fix JAVA_CRASH NullPointerException in BatteryUsageDataLoader." into udc-qpr-dev