Merge "Docs: Final cleanup for CDD source. am: f6528942f6 am: 1de030a2f5 am: 9c520fb9a1 am: a4caa1d550" into nyc-mr2-dev-plus-aosp