Scope styles to avoid incorrect matches

Bug: 52003
Change-Id: Ic8978f57a7c7e4a29b09e234546cc5e77d9f2e53
Merge "Scope styles to avoid incorrect matches"