Merge "Add mts to build file" am: ddc3ee1f3e am: eef68118f3
am: f107cefd74

Change-Id: I1a47bce4b4a9b5df23ff9e623e6aa24bb7d16c63