am 845e5c77: am fc11ebc5: am 3d5a4240: Merge "Fix build."

* commit '845e5c77b551b7b3079f9e6adf1f780f96729c33':
  Fix build.