Merge "Sonar Fixes - MusicDataStoreHandle.java"