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

Change-Id: I00ecc3ae0a53d16b9736ca411d79b2018c3b0c8e