am 87015c01: am ab88ad93: Merge "Fixed a Data Usage crash" into lmp-mr1-dev
automerge: 6a8b163

* commit '6a8b1634c053192d2abfdd8f1e0f5df9aecbf216':
  Fixed a Data Usage crash