Fixed dynamic call to static method

Change-Id: I3596b90c0e9ada03c8170b21c988a58a1a56aa8f
Merge "Fixed dynamic call to static method"