Merge changes I384904b9,I73e63c16

* changes:
  [WifiScoreCard] Deserialization
  [WifiScoreCard] Add elapsed_ms to proto