am 93f11ccc: am 9193d8bc: Merge "code cleanup : unused import statement, local vars and static finals."

* commit '93f11ccc2a6b85ff30ebb38fbc11d2d0ea464ab6':
  code cleanup : unused import statement, local vars and static finals.