Merge "Fix error mask generation in checkLineContinuity" into nougat-cts-dev am:...