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

* commit '50ece5ec53661a51ce5a15f782fdcd747171bc02':
  Add service_contexts to policy update bundles.