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