Merge "Fix lint error." am: dde8b86949 am: b67e19ca71
am: 2f20bbfaa9

* commit '2f20bbfaa93166723b9db3b337523bc7207cc86f':
  Fix lint error.