Merge "Remove test skips associated with b/37240685"