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

Change-Id: I03fcdebbe246fcffb92b7598d3084b3383982d98