Android N Preview 3 (NPD35K)
Merge "Fix compatibility issues with Java 1.8 Map"