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

Change-Id: If8cde019e56816d98f441a7ae9ca11bfc85d7619