Merge "Use old UUID.fromString if app's target SDK is before U."