Merge "lshal: avoid FQName globals." am: dd5506c236

Change-Id: I350ffebeb845b2e4f4e3fb8798ccc1da2bf784f1