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

Change-Id: I0648740d9262700f935831a0fecc4e3e88e6373d