Use new static instead of new self

See code review on I957d6bda626b8e749a99717b5c89c4db38a36bf8

Change-Id: I79e4a987636509515df044da7a6951d3e4b4f824