Merge "Fix compatibility issues with Java 1.8 Map"
am: 2526b94c32

* commit '2526b94c32a5d030bb705c8622863205df463567':
  Fix compatibility issues with Java 1.8 Map