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

* commit '387597a2560826a22dc18cc78ffaed75f9672ff2':
  Show removed user's data usage under its correct item