Merge "A little more on issue #30766518: Document what targeting N does" into nyc-mr1-dev
am: 848c690f69

Change-Id: I803623ff3404aaeb088f4fb679d0abd8723f4f43