Merge "Merge "Loosening matching criteria to subset matching instead of exact matching." into oreo-cts-dev am: fc704fc0f1"
am: d52d4c61c9

Change-Id: I114e801333f270b380076dbedb87797a3bb37c94