Merge "Fix NPE in usage stats manager (recent regression)" into oc-dev
am: 091050e92a

Change-Id: I5da7220aa9f5ff0db999c00881577b160e6b17ba