Change to SDK Platform v21.1.0