am 42280a7a: am 0bac7fa7: am 3b9ce37b: Fix build break.

* commit '42280a7a49864aa857311cb4aa5a20624dbf5188':
  Fix build break.