Merge "Add tests for .equals and toString" am: 7128746a9f
am: cc51d3b2ae

Change-Id: I6d9393a4822eab544d6cf97e63691090e4f31e94