Merge "Fix issue #30766518: Document what targeting N does" into nyc-mr1-dev am: 75cdd5f68f am: 9248b200f7
am: 233a9c4825

Change-Id: Ia5857b0e05ab76dafd97bb4fd17cd850b83a34da