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

* commit '1ef888e564926b78aeb02ef1085be2f72227b862':
  Add service_contexts to policy update bundles.