Android N Preview 2
merge in nyc-release history after reset to master