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

Change-Id: If5de66f03f7bef4f14b4f44f8af5742d2a8fe1cc