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

* commit '377a0bb82b73ca328f1aa3e08dc47aed68e2f7b8':

Change-Id: I19adfab7c4ea86ef34768801cc8da8f523350219