Merge "Fix call to equals that could never succeed." into nyc-dev am: 748620e9f0
am: ecc799a076
* commit 'ecc799a0761f60237bcd6da516e32a28f5951b5a':
Change-Id: If26f115ccd0661536afced9165fcc149d62d3946
This commit is contained in: