Merge "Add mts tag to the build file for MTS testing"
am: fd1f875e39

Change-Id: Ida08be7794032867536fbeb12e59f572aee70673