Merge "rework SystemSensorManager.java"