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

Change-Id: If4ba94ff09f9160727befc47f09eaed0d7a8af64