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

Change-Id: I2c3de5b2cb0d60fc4aef08256939b50e67d7aa53