am ee06ede2: am 38d3b133: Merge "Fix lint error."

* commit 'ee06ede25c20c1d48628918b324301311a51ba64':
  Fix lint error.