Merge "Modifies Self-Managed CS binding detection" into oreo-cts-dev