Android N Preview 4 (NPD56N)
Merge "Fix GuardedBy analysis."