Merge "init: use FQName parse"
am: 92ca281cba

Change-Id: I7ddb8343841a5e14b24b16a57ec2b8732845ffef