Merge "lshal: avoid FQName globals." am: dd5506c236 am: 2b3ad23b0c am: cda64005d4 am: 58d9b26b81 am: 663b99369d

Change-Id: Ie5187d10745b8550e8cc1d2bf7d19a2d27ddf33d