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

Change-Id: I8793a0c41d8645af64ee8cb919ad6d8c7fd1529c