Merge "Ignore DE retrieveKey failure for non-user-0"