Merge "Merge "Merge "Fix error mask generation in checkLineContinuity" into nougat...