am d293d229: Merge "Create missing Uids when recording network stats." into jb-mr2-dev

* commit 'd293d229493a2d661ebb1776a0915297927a5ca6':
  Create missing Uids when recording network stats.