Merge "FQName tokenName respect empty mName."
am: 5c6b326121

Change-Id: I47538e65e3913d4d689512835809feb86fde49ad