Android N Preview 3 (NPD35K)
Merge commit 'f0217cdbde4334bfe2fad7fa484cfa000241ea08' into HEAD