Merge "blockiness_test: fix implicit float conversion" into nextgenv2