Merge "Switch from deprecated/removed JobInfo method." am: 2c6267a622
am: 337e12fe40

Change-Id: I2f99e6b2aa6656d2a6457363c90b782073423bc1