Merge "Merge "N is API 24" into nyc-dev am: f211cae2ed am: 233e8ae762" into nyc-mr1-dev-plus-aosp