Merge "Add mTimeStamp to SignalStrength" am: aa5b09f6ad am: 7a3082f680 am: 5cdde8b871

Change-Id: I30420d209d39b112c9569525355895d6f1924277