Merge "Remove unusual static method call"
am: cbe9c295a3

Change-Id: I3ae602232226ef3a1e482dd5a34e1025118c30b7