am a58a31ac: am 07b554fc: Merge "Fix lock ordering in JobScheduler" into lmp-dev

* commit 'a58a31acbbd2bb4a971cb82530495051dcf1d7d8':
  Fix lock ordering in JobScheduler