am ab88ad93: Merge "Fixed a Data Usage crash" into lmp-mr1-dev

* commit 'ab88ad9381dda4afe59d00966cb783426f5f44a3':
  Fixed a Data Usage crash