Merge "Fix link-type check warning on AoapPhoneCompanionApp"