Merge "fixed sonar issues in CachingUtil.java"