Android N MR2 Preview 2
merge in nyc-preview-release history after reset to 6697c183c48387fb577c5ded9c52fcfa071af2a7