Revert "Cherry-pick the relevant parts of master change"

This reverts commit 5a4844e307055c0ce26b58e99b7d7b485ecffd60.

Reason for revert: multiple build breakages b/137069068

Change-Id: If48bfa2d2cab0877a053743b3ec53820d0c4ed6b
1 file changed
tree: 81e65c0a7bce0c825950e89e4e1788401d7cef88
  1. core/
  2. services/
  3. tests/