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

Change-Id: I930b6873fcc24aebcf430f356bc1002db665ce5d