Merge "Add slot based ICC channel APIs"
am: 2fe83d4724

Change-Id: Ide129fa1f7ef6f614d1371f964c0dbfd97e5d2e3