Namespace switch attrs
Fixed library Gradle file
Merge branch 'upstream_pull_request_121' into merge_upstream_pull_request_121