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

Change-Id: I89a31203310c0ea130b9a4f70656a2f81f372c34