Merge "Need to check isManagedByCompanionApp before calling getMacAddress()"