Merge "Add slot based ICC channel APIs" am: e278d2bcdd
am: ca075c3176

Change-Id: Ia43d743a06f21a812f74f98541e618f627dcf4a7