Merge "Remove unwanted parameter (it was a typo)." into honeycomb