Merge "Update equals and hashCode methods of NoMan.Policy" am: e3d6061a67
am: e9e1e8290a

Change-Id: I75da768cc6b9178ea9fa9a4c37940fbd48321517