am 6358cb08: Merge "Add a basic test for NetworkImageView"

* commit '6358cb0819f8bae7bfc6ac492721ca3015956c6b':
  Add a basic test for NetworkImageView