Merge "Remove unusual static method call" am: cbe9c295a3
am: 36beeefc84

Change-Id: I6ecfb33be300b88a9308102595f0e79cf2f18ae4