Merge "Merge "N is API 24" into nyc-dev am: 4957b79ef6 am: 3b875f3f53" into nyc-mr1-dev-plus-aosp