am 5e96448f: am 58818ab5: Merge "Fix the build" into honeycomb

* commit '5e96448fd9addcc8e7bf1e06aa0fc4b2ab2a517d':
  Fix the build