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

Change-Id: I6133c2bbd1b85515a316b10d93d998f9997118f3