Merge "Modernize CTS/STS regex asserts." into oc-dev
am: 40aed69f2b

Change-Id: Ia08c44887ea9327080efcdd7f4441410322562b3