Merged upstream 3.0.3

Also updated dependencies in gradle.