Merge "Add APIs for improved MTS testing"
am: 65c8f94fe4

Change-Id: I79098fb87eb2abb0136c47a6f16dfbc4bbbff1f1