Merge "Re-enable some test cases" am: 8feaad7249 am: a76d88d26d am: 450c3bc1cd
am: ea0e2bd457

Change-Id: I6f3eaa28a59dd11037c8d1eec9b9621a23bf220a