Sanitized entity initialization

Sanitizes change Iab129054fef513bbdfbb8a8322103f2de26a4b60.

Change-Id: I217d6d915479ee2beb58ab2bf33291e61d2e9c48