Merge "Fix testGetMap_twoValues() failures for sqlite"