Revert "Migrate to upstream policy version 30"
am: 5ca5696e8b

* commit '5ca5696e8b656466a9d46b13d7ab18a13d8c1bba':
  Revert "Migrate to upstream policy version 30"