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