Added support for Captivatemtd

Change-Id: Ibc6d1639c12dd4618b05cc7dbed5c185e42e6719
Added support for Captivatemtd

Change-Id: Ibc6d1639c12dd4618b05cc7dbed5c185e42e6719
Revert "Added support for Captivatemtd"

This reverts commit 1d151e1e48789464d3f3c5180de728591dc9c651.