Merge "fixed sonar issue in R_CloudConfigMigration.java"