Merge "allow otasp activation for system user only"