Merge "Fixed sonar issues in MusicDataStoreHandle.java"