Android N Preview 4 (NPD56N)
merge in nyc-release history after reset to nyc-dev