Merge "lshal: use FQName::parse" am: dabafa01b8 am: 0c8248a9d4
am: 04d0c2b81f

Change-Id: Icfd4d46879e78b5131fd1711b556d199c826095c