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

Change-Id: I4aeb23693a40f27d0e28d00b6b489a6db741cfd6