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

Change-Id: I5370524796b847cd64867e9c0b229463da36ae5b