Android N Preview 5 (NPD90G)
Merge "Fix compatibility issues with Java 1.8 Map"