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

Change-Id: Ibdfcddcb7ed9470580da3a996c44b7591dacd050