Merge "Specify the size of the Map in the constructor" into jb-mr2-dev