am e8a470cd: am e37e3301: am 09b84870: Merge "Remove declaration of unused static variable"

* commit 'e8a470cdad85fc0e50115242e6904abf8af5cc9e':
  Remove declaration of unused static variable