Merge "lshal: avoid FQName globals." into rvc-dev