Merge "Changed order of metered network check." into nyc-dev
am: 901854e

* commit '901854eb92bcc8b12d9aaf350210e72eb7585416':
  Changed order of metered network check.

Change-Id: Iad87c8f35e2a1aac56b9581e2c3f035dd02141e0
tree: baca373cd5ee573fa14006899b7f54843bd54db2
  1. tests/