[automerger skipped] Merge "Update equals and hashCode methods of NoMan.Policy" into qt-qpr1-dev am: d6dfaf4c9d -s ours
am: 72594630e2 -s ours
am skip reason: change_id I15835f784ba73b40eccf92a0a430905d28647669 with SHA1 4f8b0224e1 is in history

Change-Id: I7b342c0cf83413a0a1ff9dc711eb03f68831240a