Merge "Move to isolated testing."
am: 604ccb147c

Change-Id: I1003c6b6be21e1ef20ecd89842bd5189aab26403