Merge "Don\'t crash on non-app data usage" into nyc-dev am: d1a4e452ed
am: 1c06aedc3f
am: aa91cfe46b
* commit 'aa91cfe46b5f27ab48d8f30e48694b83fed07315':
Change-Id: I62f5cd7a332b230af5bc61d897d0818a9b7cc02d
This commit is contained in: