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