Merge "Reset target sdk version of ParseTypeImpl"