Use "new static" instead of get_class

Change-Id: I5ac17cf390e6e2dd6ec8e8e80b247d0c929742aa
Merge "Use "new static" instead of get_class"