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

* commit '489d03c0c3f7e360e89100ed05d03d347eff1538':
  Show removed user's data usage under its correct item