Merge "Remove the tests which is only fixed in support lib and master branch." into mnc-ub-dev