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

Change-Id: I60fa2a03c07ec2cc6eec45ec4fbc3e589836fc41