am e9553ae3: am 2e0f89b1: Merge "Fix lint error."

* commit 'e9553ae31a50f858e353d4956cd214f60cc407a1':
  Fix lint error.