am 3ce74521: Merge "fix build break"

* commit '3ce7452199d285cf37030a3b75f497ee5d5b7e5a':
  fix build break