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

* commit 'f51846147d400c40dae2fbffc42b9868b35915e5':
  Add a basic test for NetworkImageView