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

Change-Id: If5641d750e89f01408eb31dee18cef0aa115d5b3