Merge "Remove ShadowKeyValueListParser"