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