Merge "Fix dangerous unsafe_get() in SensorRecord" into nyc-mr1-dev am: 93ec87d2da
am: 66ae0846d3

Change-Id: I7b83819d2e890dcd0e8181a822bb7fd36cf7956b