Merge "Avoids leaks and major revamp of the JobScheduler sample" into nyc-mr1-dev am: 432fa5cc am: 357b996a am: 9ae51632 Change-Id: Iae786e9eae05c4469b07e4dc7a880e766684a0de