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

Change-Id: I073b63e738f70ad20fa5beb1f89d60ea3bba2038