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

Change-Id: I1b86866748afa6d6014abcbf59116a7abf67b54e