Merge "Remove obsolete tests"
am: 04cc6db79b

Change-Id: I87f666b57b91dc393cef62cb1eaedb6898e264f1