Android N IOT Preview 2 (NIG40)
Merge "Fix compatibility issues with Java 1.8 Map"