Merge "Fix for a possible race condition in Sensor CTS framework." into lmp-mr1-dev