change null to bundle
Fixed typos to make this sample copy-pasteable
update gradle wrapper
resolve conflicts