Merge "Don't allow channel 0 for transmit apdu channel" am: 2264269c1b
am: 67fab33ec6

Change-Id: Iaf461eb8b6b7d9ea7032e5d486c2354fceb840db