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

Change-Id: I143959d5a6e2fd25910f190be5e2edd6209e3873