Merge "Change function parameter from int to float." into honeycomb