am 63af4910: am 81b5d555: am 448af885: am 5a18b4bf: am b3e40760: Merge "Avoid a deadlock between PMS and AppOpsService" into mnc-dev

* commit '63af49102373ac575eee2a8c30e2facbb13e1ca5':
  Avoid a deadlock between PMS and AppOpsService