Merge "Further relax line verification in primitive bbox tests" into nougat-cts-dev...