Merge "Sonar Fix: LcmProvider.java"