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