Merge "Remove redundant LocPosTechMask definition"