am 9a0485aa: am 1ef888e5: Merge "Add service_contexts to policy update bundles."

* commit '9a0485aa567c99157e45d08e9712a281f34ffc5f':
  Add service_contexts to policy update bundles.