Merge "Avoids leaks and major revamp of the JobScheduler sample" into nyc-mr1-dev