Merge "MCAP: Add test interface ID (1/2)"
am: 9dbf14a312

Change-Id: Id3171e40dafe7b6dc6c32aa5fc83b900eebe2a5e