Merge "Merge "Modifies Self-Managed CS binding detection" into oreo-cts-dev am: ad51be6e44" into oreo-mr1-cts-dev