Merge "Reset target sdk version of ParseTypeImpl" into sc-dev