Merge changes I93364c74,I5ca831b8

* changes:
  Exclude MTP implementation from simulator build
  Fixes for simulator build on lucid