Merge commit '635193ab36302e5f65e99c7df2f256cfd37068c7' into am-b7f1a67b-2024-4274-aa7d-e88e8cceb407 * commit '635193ab36302e5f65e99c7df2f256cfd37068c7': Require quotes when searching for blkid keys. Bug: 80436257 Test: manual Change-Id: I4cbae2d594edefa10e5e2c5236d17fe3d37818cd (cherry picked from commit 9a35ab6a4f0cbc47ff389f0c632218a39bf49a45)