Merge "Merge \\"docs: Updates for DP4 release\\" into nyc-dev am: 7c79f1663c am: 704f8bfc3c" into nyc-mr1-dev-plus-aosp