Updates for latest SDK
Merge pull request #50 from google/justin-work

Updates for latest SDK