Merge "Remove obsolete tests" am: 04cc6db79b
am: 18dfe83e96

Change-Id: I4c3200a5f286a344a6b805ee6be5968eac60c547