Merge "Fix selector in XSLT" into nougat-cts-dev