Merge "Change UT to disabled by default"
am: 3c1a889a9c

Change-Id: Id0e575b3e17515667371ff626a4423e1cb82b2c0