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

Change-Id: I5dd6875e8ead5733bebea25daa2c7fb97f5b81e6