Merge "Found a couple of more references to Android N. am: 9af57aa309 am: 4c9ecfbd01" into nyc-mr1-dev-plus-aosp