Merge "Remove old manual test."
am: 88eac84708

Change-Id: Ibe4dd06c307d3d66d1eb349bd64847d869fbc8df