Merge "Fix TimestampedScoredNetwork parceling logic." into oc-mr1-dev am: 7ccaa98fbb
am: 05ebe674c1  -s ours

Change-Id: I29ebaa39053b36ecd1c58c6c40d3db0a50d76771