am 400b8016: am 387597a2: Merge "Show removed user\'s data usage under its correct item" into lmp-mr1-dev

* commit '400b801664e59ef68072e231849a0e762edcd3c8':
  Show removed user's data usage under its correct item