Merge "Fix issue where sensors wouldn't be reregistered" into qt-r1-dev am: f61fdd8249
am: a57807cf51

Change-Id: If3388e78b8bca0aebcea80d123bc8707f3598eb3