am 8a363bb1: (-s ours) am 1773ded8: Merge "Fixed key comparison in equals method" into mnc-dev

* commit '8a363bb13de1fb0600a69352a0fb4a844fba21e2':