Android n mr2 preview 1
merge in nyc-preview-release history after reset to nyc-mr2-dev