Don't use f'' strings and use .group() instead of [] for RE substring matches. Closes #1433 Change-Id: I464c6eb063702c90c2308598927e7db8358703d1 (cherry picked from commit 54ee927773)
54ee927773