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

Change-Id: Id5863759960486bb3c9cf4d391e560cc7a4a9b46