KeyValueStorage.getNonEncryptedQueryValues is returning a Hashmap instead of ArrayList
Merge branch 'master' into IABv3