Use "self" for local static member reference in EntitySerializer

Change-Id: I4d4621b925ba61c0a4f6410ced48f05b01e4789b
Merge "Use "self" for local static member reference in EntitySerializer"