Merge "Override StatusHints.equals" into lmp-dev