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

Change-Id: Iffc91e04e89e7872ae59a791596464e95f79effe