Merge "Reenable tablet tests for OOP TAPL tests."