am 5f6e583c: Merge "Don\'t break the build!" into honeycomb

* commit '5f6e583cc8c27ac2eb217a7d1065a6aeda00a033':
  Don't break the build!