Android N MR2 Preview 2
merge in nyc-preview-release history after reset to 1e94954a025b335a2e43fc901e08824faa8d9801