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

Change-Id: Icd039f27190c07e74a046e0b9f7a9b447346ab8f