Android N Preview 3 (NPD35K)
Merge "Fix GuardedBy analysis."