Merge "Merge "Wait for JobService to start before scheduling syncs" into...
Merge "Merge "Wait for JobService to start before scheduling syncs" into nyc-dev am: a16a3362 am: 1e8362d4" into nyc-mr1-dev-plus-aosp
am: 5d85f311
* commit '5d85f311':
Change-Id: Idf26222332332bf167af79c0230cd7c7d89f0a72