Android N Preview 3 (NPD35K)
merge in nyc-release history after reset to nyc-dev