Merge "Merge \\"docs: Narnia 2 advertising language update\\" into nyc-dev am: ebad16f3c0 am: c7fd306a78" into nyc-mr1-dev-plus-aosp