Merge "Fix erroneous constructor in ScoredNetwork.java" am: 9d55f43719 am: eaed9ef0b7 am: 60a850b670
am: 3339d5b120

Change-Id: Id8966b9d9ba127fe043b6110cb5556f15c56de54