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

Change-Id: I4a54f4edd4599d7053101040bffac353b3c46048