Merge "Fixed key comparison in equals method" into mnc-dev