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

Change-Id: I2a3701b26223d6b24443c7df5c01939f93ddde5f