Merge "remember and report network score" am: b112882ab4

Original change: undetermined

Change-Id: I1c9636cad2a15eec4686b2a7501a0ef647d07442