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

Change-Id: Id12bed2fcc85cb5f7bc25c788fca76cb5f80563e