Merge "Add propertyMatches method to compatibility PropertyUtil classes" into oc-mr1-dev am: c2a5d3a476
am: 400e75ae29

Change-Id: I52adfea60b81677ae0a954ff7cdb4100627ee62a