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

Change-Id: Iae455b543126715bf341312e0279911333d11e3d