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

Change-Id: I0f727cc60a61cb63a6c8d4297ca36c4e46ecbe0d