Merge "Remove obsolete DoubleEvaluator" into honeycomb