Merge "Add CPS in release notes, API, Architecture and Component pages Update AAI...