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

Change-Id: Id8043bbd5e7e91c17cff53adcb44340fed338313